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: 7e771703 am: ae6c8fac

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



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