Merge "Fix wrong count return for getPhoneSignalStrengthCount"