[automerger skipped] Merge "Support dynamic 64-bit drmserver" into udc-dev am:...

[automerger skipped] Merge "Support dynamic 64-bit drmserver" into udc-dev am: 6afa26c7 am: 54d5e2ae -s ours am: ea7f2b7b -s ours am: cf287a99 -s ours

am skip reason: Merged-In I4de433ccee8fc316ce565470aa962ab62c95e60f with SHA-1 f907e6e2 is already in history

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



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