Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp