[automerger skipped] DO NOT MERGE - Merge Android 13 am: c8b3e7f2e6 -s ours am: 6fd6ddd6ad -s ours am: aa12adc256 -s ours

am skip reason: Merged-In Ie8c6a3801a53d2a798335536bace60b7d0791d84 with SHA-1 d48da2a00b is already in history

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

Change-Id: I8926374cf1a757f25b4d724c7d8e18b6da9c0199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>