[automerger skipped] Merge "Add PRIMARY_SUBSCRIPTION_LIST_CHANGED in AndroidManifest." am: 60635bb35a am: 2251e4c22f
am: 8d837ace8b -s ours
am skip reason: change_id I40ea487f2b7cc175bea21281a2594cc31088b74f with SHA1 898fa809d8 is in history

Change-Id: Ic94372249cee9543f87a75654591401ef22b84b1