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

Merge "Remove application package name from ContentCapture logging" into tm-dev am: 65f8aea1 am: 1a79cffc am: 31a4f899 am: 2c21ee4a

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



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