Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8

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

Change-Id: I2da154061359ad72ffa736873f06052be93ed721