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