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