Merge "Update the java doc for PackageInfo#versionName" into udc-dev am: 2f4a06c6 am: 51dae434 am: b883b1b0

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



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