Merge "DrmManager: check drm.service.enabled in init (2nd attempt)" into sc-dev am: 01ddb68cbb

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

Change-Id: I242fae8a7fcf9f72b83c92dda56acd3d79c19f47