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