[automerger skipped] Merge "Use new APIs to register/unregister network policy...
[automerger skipped] Merge "Use new APIs to register/unregister network policy listener" am: 5628673a am: 37e5a09f am: cd906d20 -s ours
am skip reason: Change-Id I1f191d36901001bd91218a19ee5d775cacdddff2 with SHA-1 cf2126f8 is in history
Change-Id: I46d7b2735ad969fd9a05b7ffe56709d7015877e6