Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e  -s ours" into pie-cts-dev
am: 352dda391e  -s ours

Change-Id: Ic3813b1149ab3cc718e0119794f7a58ea8bdb4dc