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