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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8754f806f4043e06ed954e3e1abde3205a3613e5