[automerger skipped] Merge Android 12 am: 7b74d94e99 -s ours am: e92a427dd3 -s ours am: 7e2c9f9501 -s ours

am skip reason: Merged-In I70bbfc1b668102470df4085fc51943538d9017a5 with SHA-1 1b05fe17e9 is already in history

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

Change-Id: I304ed4a2b8165e25cf889b4dae43d9d21d019b4b