[automerger skipped] Merge "Fix test failed of...

[automerger skipped] Merge "Fix test failed of SatelliteSettingsPreferenceControllerTest" into main am: 08906d9c -s ours

am skip reason: Merged-In Icf82dab5a497304df9c3e6a8159e5806ac687445 with SHA-1 48895aaf is already in history

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



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