Commit 7982b965 authored Oct 08, 2021 by Xin Li Committed by Automerger Merge Worker Oct 08, 2021

[automerger skipped] Merge "Merge Android 12" am: 9243f909 -s ours am: f5320529 -s ours

am skip reason: Merged-In Ifb27b3eb12454fa96f07e6797745c697b4f831c4 with SHA-1 adcb6a27 is already in history

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

Change-Id: If958fc41d65843a914ae28a596efc4738da58269

There are no changes