9a7bbf9367
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1817684 Change-Id: I2655c1c2b74b0501912fa4e90f5655db682b2932