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

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

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