[automerger skipped] Merge "Add AndroidTest file for ExtServices" am: 3379469950 am: 66dd536421
am: 7f63317335  -s ours

Change-Id: Iaed5ac5671161690d1fe366d33fd6ef39b05bb63