Merge changes from topic "presubmit-am-2547badef93c4b82b645e06e98481458" into tm-mainline-prod am: 9475bb77

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



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