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