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

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



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