Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 17:56:26 +0000 (17:56 +0000)]

Trivial merge