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

Merge "Merge "Fix app version name RTL issue" into udc-dev am: e1532234 am: 1d8cc87e am: 28f1d9bd" into udc-qpr-dev-plus-aosp am: 2d902bfc

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



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