Merge "[RCS] Refactor App" am: dfaa16d5fe am: 888a0e1574 am: e02d2fc696

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dc0850e5ce72acd4ea8d15d6e4548c9e0e79b88