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

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

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



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