Merge changes from topic "presubmit-am-7c91d7e05e304e4cae9f1ccb64257694" into...

Merge changes from topic "presubmit-am-7c91d7e05e304e4cae9f1ccb64257694" into tm-mainline-prod am: ce426a0f

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



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