Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414876 Change-Id: I8baf2ffe6f97fcaa1c1abf0a36fe4a2cffa8152f