Merge "DrmManager: choose plugin load path based on arch" into tm-dev am: 768f4c4802 am: 4c8eab5e13 am: 99762632f5

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

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