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