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