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

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



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