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

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



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