Merge "update sim activation state for otasp" am: 6b784f4c92
am: 046fdb7d99

Change-Id: If9d62816f9e9809acfb7d4873399acf6540ecf6f