Merge "Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev am:...

Merge "Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev am: 61a7196f am: 4c6dc72a" into tm-d1-dev-plus-aosp am: 5e1bd9e7 am: 07395207

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



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