Merge "Add AndroidTest file for ExtServices" am: 3379469950
am: 66dd536421

Change-Id: I20c5a73c8f7dfbf2c25920394be6703b1aa2fcc6