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

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

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