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