Merge changes from topic "presubmit-am-9657069f584e4ed1b6ebce8b6d82a21e" into sc-v2-dev-plus-aosp am: 45477371 am: 722fe369 am: 62076b49 am: d0b365ee

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



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