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