Merge "Enhance TelephonyRcsService to only create needed features" am: 1d4a73999d am: 22a92353dc

Change-Id: I80e456f093e80d08fd8d0a80bb38f0ac6f615940