Merge "Remove application package name from ContentCapture logging" into...

Merge "Remove application package name from ContentCapture logging" into tm-dev am: 65f8aea1 am: 742c3eed am: 8cba1a29 am: e0ff01f7

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



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