tree d1bf20f422af434dc093bcccd1aea8eabaff3cb0
parent b88e53c5eef70815fa8a5bdf6eed801efe15c819
parent d6cceec670ec735daf3fde4ba5426614501b1bdc
author Hai Shalom <haishalom@google.com> 1612976142 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612976142 +0000

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