Merge "Removing logs for b/237743330" into tm-qpr-dev am: a1b16dfe am: ceeb4ff9

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



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