[automerger skipped] Merge "Move the dependency on protolog.conf.json.gz to...

[automerger skipped] Merge "Move the dependency on protolog.conf.json.gz to services" into main am: 505e763e am: bb84af4f -s ours

am skip reason: Merged-In Iefdd457e99fc61c1ce2f5a05ae59f5e12256a764 with SHA-1 20d61794 is already in history

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



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