Merge "[RCS] Refactor App" am: dfaa16d5fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If39c501ef485ca935cc9a8310eb4a5e8d185480a