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