[automerger skipped] Merge "Inject log group mapping into ProtoLogImpl generated classes" into 24D1-dev am: 6a06d8966e -s ours

am skip reason: Merged-In I2a2e4cfdc51113a5aaf2adc51aa10f5df47a5051 with SHA-1 869ebffa43 is already in history

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

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