Merge "Add assist content admin control" into aosp-main-future am: e3db116cfd

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

Change-Id: I8a551b111e91c75549ad5175cb37b28aa7d341b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>