Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586 Change-Id: I01bf98c6c5c0f816fbe5a6e90831b11b1f9fcd2e