Merge "revert deprecated sim activation logic" am: e895000feb am: 6d194feae1 am: 21c0992e50
am: 770ee2c594

Change-Id: Iaad7f217f73b03ac214d117107778cf0d359d340