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