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

Change-Id: If0929c74d071f619a04dd4e5a33ff851769c140e