Merge changes from topic "presubmit-am-7f9c15ce2f1a41e98cec0dbcd8143ed2" into sc-v2-dev-plus-aosp am: 4e13e7e5 am: 2e83ed96 am: bbc7ee48

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



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