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