[automerger skipped] Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." am: 6f7d3848c5 am: 6e4f0f3ee6
am: 12b9f89abf  -s ours

Change-Id: If5e52ef7d7052ba40bfb8c7da0c11431846f3169