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