Merge changes from topic "am-1f62af788801476da132d12378d218d5" into main am: 847e447e -s ours

am skip reason: Merged-In I2eec99a8e8f894546e025455cc0c5eb58962395f with SHA-1 8433c50b is already in history

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



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