Merge "Support for Terms & Conditions notification" am: 67bb51ec40 am: fed30f42e8 am: b5a72aa56d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a47d12f41b9247910078ec8d6cd6e1f1589956e
tree: 5b41d02a891197f9752726fb54d8d0b3b01aebf2
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS