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

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

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



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