Merge "Remove deprecated ACCESS_DRM permission." into klp-dev