[automerger skipped] [conflict] Merge "Fix the pointer position when displayed in RTL" into tm-dev am: 91d28d1b21 am: ca9b8b4392 am: a721fc820b -s ours
am skip reason: Merged-In I71a6f64a43c1b7bb5e0a30773d4cc5ae55c63b6a with SHA-1 fed87296db is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18671779
Change-Id: I475451aa048f5af9094a896c4efaff801ac5bbc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: