Merge "Add AndroidTest.xml for privacy tests."