[automerger skipped] Merge "Support multiple DcTracker for IWLAN refactoring" am: 4e61cff5b4 am: 282b1053cb
am: 73a40fabc0  -s ours

Change-Id: Iff755602cf38e0bcfeffc063fd216a60579553d9