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