Merge changes from topic "presubmit-am-695a0670652f409eb2ad65b923b8b42c" into...

Merge changes from topic "presubmit-am-695a0670652f409eb2ad65b923b8b42c" into sc-v2-dev-plus-aosp am: 9656668b am: 0611b888 am: 3dfc03a5 am: d43f2d74

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



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