Merge "Support for Terms & Conditions notification" am: f5962f27dd am: 1b117cef4a am: 19bc1e2ee9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1557486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I710ec54f5b2bb8de16fa7f3a9a6a45540066c99b