[automerger skipped] Merge "Merge Android 12" am: 1c7835ca97 -s ours am: ed5cb382b9 -s ours am: 2db646e53e -s ours

am skip reason: Merged-In Ibac10766358da418de5f64487275292845aa86cc with SHA-1 d1cb414049 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/jsilver/+/1847425

Change-Id: I18a00cb758e41f39674e02b1ebc6208c4605767b