[automerger skipped] Merge "Fix carousel scroll in RTL" into udc-qpr-dev am:...

[automerger skipped] Merge "Fix carousel scroll in RTL" into udc-qpr-dev am: 6c599e91 am: 13c9f820 -s ours

am skip reason: Merged-In Iab3175cfd344c189d97cf598fd57dadd58d19184 with SHA-1 bdd4fbb3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575091



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