[automerger skipped] Merge "Migrate imports to use proto_logging" am: 8fe82264 am: 939e07be -s ours

am skip reason: Change-Id Ib40fe8cb03e52de375cf45ac10b11ed67b2f4196 with SHA-1 431bc743 is in history

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

Change-Id: I3f0fcb85e6e6f8315763409864b3dcefdd8e0171