Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am: 016409b3d5

Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a