Merge "Add service to test apk to execute arbitrary query"