[automerger skipped] Merge Android 12 am: e3e14c0ff1 -s ours am: e23da4101b -s ours
am skip reason: Merged-In Ibf9bc06cdb68174a9f844a0f735fe72b8fe78826 with SHA-1 19af87e3e6 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1847854
Change-Id: Iecf82d22fc9d8539b1017702266b1423f0d7d0d3
This commit is contained in: