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

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

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