Merge "Merge "Ignore a lot of failed test cases on Settings" into rvc-dev am: f90d2b2bca am: 0ce6a31ca8" into rvc-d1-dev-plus-aosp am: 343636bee7
Change-Id: I335ec6a1f1dad2037aff281f12183ffa04ed5d50
This commit is contained in: