Merge changes from topic "presubmit-am-1cb385dfa19f4b52a27b7639e89882f1" into...

Merge changes from topic "presubmit-am-1cb385dfa19f4b52a27b7639e89882f1" into sc-v2-dev-plus-aosp am: 18caf464 am: d710dc5a am: 10f811ac

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



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