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