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

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

am skip reason: Merged-In I02936ab6fc21da21f260ff4d5d15bf4bba37d3e4 with SHA-1 2616a635 is already in history

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

Change-Id: Iffa87ebed9f77d51c0b7c1a701e7f8702399111d