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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bc17716c16a853b88ff9db099258f97b94471b8