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