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

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



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