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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie89ab1c102898a636a05e269933531c0a862a91b