[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 17503d098e -s ours

am skip reason: Change-Id Ibac700f8e331206d7ae55e3b8f6c691c98631b88 with SHA-1 5b657deebf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa137f3ce9ff913960a670f26ede26c5e8d0430d