Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH after integrating  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH callback in TelephonyRegistry"