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

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



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