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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2751a125fc2427996df73f3ca74cfb14ef63da52