Merge "Reset SIM state if the subscription is no longer active." into pi-dev am: 4f3d29de54
am: 59dc7b1139

Change-Id: Ib2b2ac2cd24aa0663fab5d46e67e198c6a6b548c