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