Merge changes from topic "am-7d5e5bd2fc184e2ebbab7c487e278d31" into main am: 2a7388a6 -s ours

am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 5cf032c4 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3275058

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



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