Merge "CTS WifiManagerTest#testGetCountryCode: check FEATURE_TELEPHONY before calling TelephonyManager APIs" into rvc-dev