Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into...

Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759b am: 6427fd09 am: f6750f66 am: c09ace9f

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



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