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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibabb4e549706c5ab263aab9df78c9e5a0bff95de
tree: 2f2280e8131fa075522d466de87abe94f0db108f
  1. framework/
  2. service/
  3. OWNERS