Merge "DrmManagerClient: query drm service without blocking" into sc-dev am: 7f8e1eae am: c55bed84 am: 84337576 am: 6f6c3eef

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

Change-Id: I5a337d1de0917c16264359b5a5fa8248d87b9f8c