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