[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: f0d3a394 -s ours

am skip reason: Merged-In I6a9a34331edb752d51c9d2d0b6826942d0545e3d with SHA-1 b645049d is already in history

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



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