[automerger skipped] Support dynamic 64-bit drmserver am: fa2bc8b2 -s ours...

[automerger skipped] Support dynamic 64-bit drmserver am: fa2bc8b2 -s ours am: 6eca0f59 -s ours am: f7f30485 -s ours am: 61ce4f9d -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: Idfc600c48a1342c85fea8bd771fe8da7695a6a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>