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