Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"