Merge changes from topic "presubmit-am-4a9a1de9361e4051b076ccd525ae006e" into...

Merge changes from topic "presubmit-am-4a9a1de9361e4051b076ccd525ae006e" into tm-mainline-prod am: b1509664

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



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