[automerger skipped] Merge "Have setSubscriptionEnabled work for inactive pSIM." am: 60397c9f
am: ce46d6a2 -s ours
am skip reason: change_id I26db99a798aeb85e8d6d0e464ee8044ac018992e with SHA1 822df50b is in history
Change-Id: I1c65074faac0a0ad58957700bea93af3269b4e4d