Merge changes from topic "presubmit-am-d934d4d8abe3421d83f57e048f952950" into...

Merge changes from topic "presubmit-am-d934d4d8abe3421d83f57e048f952950" into tm-mainline-prod am: 001325c1

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



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