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