Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am: 016409b3d5
am: 26891a4429

Change-Id: Ic9600095313ed557a119f9e0dd656b9230dd3056