Merge changes from topic "presubmit-am-09e86c47613949079ff5888fdb0718d1" into...

Merge changes from topic "presubmit-am-09e86c47613949079ff5888fdb0718d1" into tm-mainline-prod am: 60282f0e

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



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