Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev