Merge "Modify the default thresholds in 5G Signal Strength" am: d9328f6c40 am: 372da0e93d

Change-Id: I67719624ad8d62969140bf0a613045667f3ee4b7