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