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

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

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



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