Merge "Add package, activity count in allow list for ContentCapture logging" into tm-dev am: 790afd00 am: 26edb553

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



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