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