[automerger skipped] Merge "libmediadrm logging: avoid unaligned memory" into...

[automerger skipped] Merge "libmediadrm logging: avoid unaligned memory" into tm-dev am: 73fe3dc8 -s ours

am skip reason: Merged-In I02936ab6fc21da21f260ff4d5d15bf4bba37d3e4 with SHA-1 322187cf is already in history

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

Change-Id: Iacfa896ef41c7e5b0eeae4e6288ea525d1f8d52e