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

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

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