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