Merge changes from topic "presubmit-am-870422bebde9449d9c143a13fd15d1bd" into...

Merge changes from topic "presubmit-am-870422bebde9449d9c143a13fd15d1bd" into sc-v2-dev-plus-aosp am: ad964d46 am: 9c7918c2

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



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