[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 90986f86 am: 8b14f74f am: a03633e0 am: f4fcef82 -s ours am: a6495dfa -s ours

am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 401e782b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20241730



Change-Id: Id0d61b015052be449c5ee6dec97912b692bca317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>