[automerger skipped] Merge "Encounter unknown error in test" into main am:...

[automerger skipped] Merge "Encounter unknown error in test" into main am: 45d7ae68 am: ddd03376 -s ours

am skip reason: Merged-In I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b with SHA-1 dd7e4d27 is already in history

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



Change-Id: I0b5149462da461c5473fbfc2665d94dd9e2f3f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>