Merge "Prevent VVM subscribing when carrier reset subscription status" am: 54c21601d9
am: 1e5922fe89

Change-Id: If92e1bb978c29626212a6d965cec638251d6a135