[automerger skipped] Merge "Supported data handover in DcTracker/DataConnection/ApnContext" am: 56e1062ce3 am: e055bfa0fa
am: 332b5b5786 -s ours
am skip reason: change_id I1dfecbe48e230b3cab1b8b83e8d9f9dfd241752e with SHA1 faa7a52543 is in history

Change-Id: Ideb905b4b17480ba4c9ec733d074698a9e22d31b