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 am: 5922ba5e

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



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