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