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

Change-Id: I1f802aba386eec7a81004e3f7364e120fd39583c