Merge "Add PRIMARY_SUBSCRIPTION_LIST_CHANGED in AndroidManifest." am: 60635bb35a
am: 2251e4c22f

Change-Id: I7ae85c5bb908f01f9a70d1ef62a1f01e53ec6a10