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

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

Change-Id: I21cd55b4a400e1a87745b9d1aca6cc1ecc7d45b3