[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-80b91e5f6c3340c785b1772da3a86806", "presubmit-am-8e48e4d2f9da4d69bc62fe6a4b39ef56", "presubmit-am-c978438eb5db452d8793cafc3024df96", "presubmit-am-d09990e2eb2246b1ac4d9766ce468226" into sc-v2-dev am: fd5ed2cf -s ours am: 3c71a880 -s ours

am skip reason: Merged-In I3e96ab6ada8f0c892613a1f9dcc6b6ae12f6d73b with SHA-1 225651dc is already in history

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



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