Merge "Enable instant and ABI XML tags for API 22 networking tests." am: 08c9718a8e am: a9753c8a1e
am: 5ad87375d4

Change-Id: I317046048a3af66b8c45a8e016c7860cde07a7a4