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

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

Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed