tree 2f2280e8131fa075522d466de87abe94f0db108f
parent 0db7e3cd406e49d02d16c2075879c52c366bef9d
parent f66829035633a0fd1f0bcb7117eee3ed966390cb
author Hai Shalom <haishalom@google.com> 1612971625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612971625 +0000

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