Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into...

Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into sc-mainline-prod am: 2407e6bc

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



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