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