[automerger skipped] Merge "Fix SubscriptionInfoListViewModelTest" into main am: c07341d5 am: 9c803b5d -s ours

am skip reason: Merged-In I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0 with SHA-1 f97e76bc is already in history

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



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