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