Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for...
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
am: a677ea72 -s ours
* commit 'a677ea72':
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.