8cb0b859e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870213 Change-Id: Ic3905a240f5023df716cd1ec2e907269533d51d3