Merge changes from topic "am-7c02737381864b1593fe4f753f66edff" into main am: 1f5ff0f -s ours

am skip reason: Merged-In Ie5c5f747ecd6c15ffae80cc32b9f5a90b1a44df3 with SHA-1 ec1f230 is already in history

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

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

Author: android-build-merge-worker-robot