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