Merge "Make telephonycallback specific to subId" into tm-qpr-dev am: b20b3e3024 am: 0a8e81bc3c

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

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