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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id83c0d73f18a0efd8263951773222737e59cbc31