[automerger skipped] Merge "Fix bug that disabled pSIM stays inactive after unplugging." am: 463f38bc am: ec70dfa8 -s ours am: 377e3d11 -s ours
am skip reason: Change-Id Idf5be434882ed8e03064b72b9114442217401c46 with SHA-1 cdd84b30 is in history
Change-Id: I630c7ba06cd7c3fb2059b7f2b07a2092341a3bd8