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