Merge "Preserve PIN_NOT_SET state when reactivating on VVM3" into nyc-mr2-dev
am: f205f0e5cf

Change-Id: I4173af783c71d30951993b221358aba86d8815b2