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: I56347a11022ecbcd0283b23b8e8e35fd117d9f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>