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