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

Change-Id: Icd01843c8ca0ca41741f929981c46899b4bc6ce8