[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-9b6163649ab04af9ae8747b484e284d0", "presubmit-am-f3bd2f18f3ff4c72b82bb741b56d0b5e" into sc-v2-dev am: 84efddca -s ours am: f81af7a6 -s ours

am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 72540716 is already in history

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



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