Merge changes from topic "presubmit-am-ed7698d9c5f74c86a36cd43a83b9a1a8" into...

Merge changes from topic "presubmit-am-ed7698d9c5f74c86a36cd43a83b9a1a8" into sc-v2-dev-plus-aosp am: 4067daa4

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



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