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

Change-Id: I55c9790a6a5935dcb7e8c19cca0fadc3cf2ba10e