[automerger skipped] Merge "Migrate imports to use proto_logging" into...

[automerger skipped] Merge "Migrate imports to use proto_logging" into rvc-qpr-dev-plus-aosp am: 93722b06 -s ours

am skip reason: Change-Id Ib40fe8cb03e52de375cf45ac10b11ed67b2f4196 with SHA-1 6adacdb9 is in history

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

Change-Id: Icd07479f6b7e1601a5f2240e549779d89a00e30a