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

Change-Id: I2f2a31f5dff7b3b22794152d774e664569b2a2d8