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

Merge changes from topic "presubmit-am-b691d4ec59ca4f32b52225122b2677e9" into sc-v2-dev-plus-aosp am: dec787dd am: 20d649ef

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



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