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