Merge "Add package, activity count in allow list for ContentCapture logging"...

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

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



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