Merge changes from topic "presubmit-am-772cf03f1d6d409d8c65ec7a65dc3a45" into...

Merge changes from topic "presubmit-am-772cf03f1d6d409d8c65ec7a65dc3a45" into tm-mainline-prod am: c61517e9

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



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