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

Change-Id: I62c993ce47043b9310265c0688b4ed6af8ed4938