Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a am: 4a16d794e8 am: 40bd05a1b9

Change-Id: Ifb92c6944769ee58d45e16f6a9bde870c23bf27e