Merge changes from topic "presubmit-am-c81762ef3b084d75afdf183d012bec54" into tm-dev am: 93ccdae23a

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

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