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