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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib600678f8b8fb2b04a4f6ed8f399416993f8805d