Merge "Fix app version name RTL issue" into udc-dev am: e1532234 am: 1d8cc87e

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



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