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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibabb4e549706c5ab263aab9df78c9e5a0bff95de
tree: 201344d569dd921a3ad6c2d14e2fa22789de9512
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS