[automerger skipped] Merge "Add OBSERVE_NETWORK_POLICY for shell to test CTS"...

[automerger skipped] Merge "Add OBSERVE_NETWORK_POLICY for shell to test CTS" into sc-dev am: e49d2950 -s ours am: f7103522 -s ours

am skip reason: Merged-In Iba7321c82e1a3ed773f99ccd4b9e3c24c607353f with SHA-1 010a8e06 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15047819

Change-Id: If87fa5313c7f9783c68ef0ab581ed3b00f4fb324