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

Change-Id: I3fdabb38a0056f1b596ba4e1924e2116ba600f74