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

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



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