[automerger skipped] Merge "Refine NetworkCallbackTest" am: ea89469f83 am: 06cb65fa80 -s ours
am skip reason: Change-Id I1aa0e107cf6797b06dee4a15896c63321d822156 with SHA-1 63203afe0e is in history
Change-Id: I8d2805d76fddb14c2b3f6d999ef08fb07be89241
This commit is contained in: