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