Merge "Reintroduce @FlakyTest to flaky CallFeaturesSettings test" am: cacda888e3
am: 62ce97970b

Change-Id: Iad4dfe3284f062c985a12a9f935583c8936404b3