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