[automerger skipped] Fix test failed of SatelliteSettingsPreferenceControllerTest am: 2e6be73789
-s ours
am skip reason: Merged-In Icf82dab5a497304df9c3e6a8159e5806ac687445 with SHA-1 48895aaf03
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3550773
Change-Id: Idd4431a96ebce6bbb569344cb6c16bea4c92cf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: