Merge "Support for Terms & Conditions notification" am: f668290356 am: d6cceec670 am: 4e0c1992db

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a47d12f41b9247910078ec8d6cd6e1f1589956e
tree: d1bf20f422af434dc093bcccd1aea8eabaff3cb0
  1. framework/
  2. service/
  3. OWNERS