[automerger skipped] Merge "Support dynamic 64-bit drmserver" am: 2327ba2d...

[automerger skipped] Merge "Support dynamic 64-bit drmserver" am: 2327ba2d am: 9cc09a1f am: eea3cdbf am: 5fd67e0f am: 476e8ce3 am: d610c25b -s ours

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

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



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