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

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

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