Merge changes from topics "decouple_feature_stat_listener",...

Merge changes from topics "decouple_feature_stat_listener", "ims_sms_keepmanager", "rm_ims_manager_old" am: 37562ee0 am: 61f7cf4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1428096

Change-Id: I19a73e1b18af0f85ad08f9c4620d9ef718127cf1