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