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

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

Change-Id: I93e244b49025d8d69f287fb6b676e5097e6129b7