Merge "Fix test config" into main am: 4f19466f56 am: cd33904187

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

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