[conflict] Merge "Fix the pointer position when displayed in RTL" into tm-dev...

[conflict] Merge "Fix the pointer position when displayed in RTL" into tm-dev am: 91d28d1b am: ca9b8b43

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



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