Merge "[Settings] Fix failure test case" into sc-v2-dev am: 4b9b6b632a am: 5b9bb1ea02

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

Change-Id: I3a2e04b99e58a24206a8e5cce132026de92af733