[automerger skipped] Add optional phoneId for SST TelephonyTester override am:...

[automerger skipped] Add optional phoneId for SST TelephonyTester override am: aea3240c am: 507da061 am: 60817e6d -s ours am: e10f120b -s ours

am skip reason: Merged-In I0a1ecfce2922d56a2480aba94cf3bc8c606f83c5 with SHA-1 956b8afb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2456071



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