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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2e5865b1fbbf55986e1ee272abfd28331eb2829