Merge "Add AndroidTest file for ExtServices"