Merge "Add back UCE logic into Test App" am: a1963a5a45 am: 0912b767a5 am: 1691ee101f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a06e2d01aa480454938899a06933b8bb2a5669