Android 11.0.0 release 30
[automerger skipped] DO NOT MERGE Fix scrollbar layout for RTL am: a6f64a630d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/12741965

Change-Id: I4d5a44ca086f1031cdc7c3a07e403c8d5d12d364