Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony"