[automerger skipped] Merge "[Settings] Ignore failed test case" am: c4cc279a...

[automerger skipped] Merge "[Settings] Ignore failed test case" am: c4cc279a am: c4ece27b am: 6568442e -s ours am: cc28c27e -s ours

am skip reason: Merged-In I44ac801ccbd1de0aff7a69534131919e9ef1e732 with SHA-1 6c7ddebc is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376

Change-Id: I423bd7349faf323987594602e0e1b45463278d44