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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b8be717af7a5386f763c1a9a54e1fcae2fc940e