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