am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev

* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.