Merge "Fix SubscriptionInfoListViewModelTest" into main am: c07341d522

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

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