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