[automerger skipped] Merge "[Settings] fix failure test case -...
[automerger skipped] Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2 am: f227708d am: 42d5890a -s ours
am skip reason: Change-Id I974df385d956dbff10aac874487d07d626992e4b with SHA-1 88734448 is in history
Change-Id: I0687f3940c4371fb3592dd4d5aa89192cc96db26