Merge "DrmManagerClient: query drm service without blocking" into sc-dev am: 7f8e1eae3f

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

Change-Id: Ia366d3928743c52a2b97ab9753efc95ebb2da539