tree a8fb313863a1672a68f94bb63bc20aeeff3ebd1f
parent 721d3c25e135fc1f92b07bac80d8df042e690659
parent 657648b98ad30adf4c2a66cd011003e3da7a0285
author Julia Reynolds <juliacr@google.com> 1642701097 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642701097 +0000

[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into rvc-qpr-dev am: f8994409fe am: bf4e84b7ad am: 657648b98a -s ours

am skip reason: Merged-In I8a27853c7ed05d9dfd38a3142fbbe185946c3992 with SHA-1 074a7f4ccd is already in history

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

Change-Id: I28eedcfd60a6630499b0fc4b688415dc509ec4fd