Merge "Add AndroidTest file for ExtServices"
am: 3379469950

Change-Id: I320cce226746cdab310661143fc0f3e5aa1e124d