Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev
am: 4e67a8094e

Change-Id: I874083c9db4dc348e84da9fa6ab151df68efab10