Merge changes from topic "presubmit-am-18aec42390d04aa8a4e2f55d5cd84739" into...

Merge changes from topic "presubmit-am-18aec42390d04aa8a4e2f55d5cd84739" into tm-mainline-prod am: e439e7bb

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



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