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

Change-Id: If39bdb2e656e8595c29c3aa6c646af1dd9c4b413