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