Merge "Support dynamic 64-bit drmserver" into udc-dev am: 6afa26c7 am: 54d5e2ae

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



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