Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH after integrating  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH callback in TelephonyRegistry" am: 09d39f32cf am: 665db6ac5b am: c7cc8c272b

Change-Id: Iecdb6d4e29efc394180541c11090b651e735cd25