Merge "Add version to help differentiate app versions" am: 70e3ec7126

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1583384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c42759dd5a5de6a408babf3ea0f3153fec37bee