Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using ...
Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH after integrating LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH callback in TelephonyRegistry" am: fbaf6519 am: 71d41a5f
Change-Id: Ic5dacde7fb5532de810d5440e246241901846da0