[automerger skipped] Fix SubscriptionInfoListViewModelTest am: f97e76bc3f
-s ours
am skip reason: Merged-In I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0 with SHA-1 10f5bdabb4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27151176
Change-Id: If7fe3b5301905ae957a1d8f614048cf95a6de853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: