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: 800ea454" into tm-d1-dev-plus-aosp am: f61e4822 am: dec1c336

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



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