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

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



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