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