[automerger skipped] Merge Android 12 am: e3e14c0ff1 -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: Ic18fb7f5b7056ed115b2c4526e02e1bd2e2deff4
This commit is contained in: