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