Merge "Support RTL mode in payment option" am: 7e65d7f6fc am: ef4f13c936

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: I7966cfb6f7e139575acdc0b3eb7c6166935175c4