[automerger skipped] Merge "Get rid of SIM record access in DcTracker" am: e68ccd06fc am: 48ff215bf7 -s ours am: c2dcb778a1 -s ours
am skip reason: Change-Id Iad45933ea77eb460625a891071535cbeaf8ac3b0 with SHA-1 df3001b935 is in history
Change-Id: I0f7f49194f75a2f039a1023f7dec6f96358036e6
This commit is contained in: