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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39646a23eb6c30597c6a73da0c47458cadc0bae