Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
am: bf857c7374

Change-Id: I2422f31d45e1b7242f8f73decd7eab5d4f33da3d