Merge "DrmManager: choose plugin load path based on arch" into tm-dev am: 768f4c48 am: 314ac776

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



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