Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671 Change-Id: I5ba9d65a7223fbf9d1f371e672491f09b05c1940 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>