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

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

Change-Id: I712fa5fac98d6a715c17385e665bee5bbebb8f5f