Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce am: f227708d08

Change-Id: I3dc450cb4a91c496e6a7c8306e4cd4a6b4a19a5b