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