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