[automerger skipped] Merge Android 12L am: 08fc93e240 -s ours

am skip reason: Merged-In Ib93078ad055ca21825e1d07b0e42b2ca20ceedb9 with SHA-1 aefaadf8a7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Provision/+/2013190

Change-Id: I8e0225a61730bb414056dfb855c0b3ffdf9f0d6a