Merge changes from topic "presubmit-am-5d1326e3a4194655af3a6c010a0d1f48" into...

Merge changes from topic "presubmit-am-5d1326e3a4194655af3a6c010a0d1f48" into tm-mainline-prod am: 8b99df61

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



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