Merge "Clear up ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED logic"