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