Merge "Follow up on "Treble HAL interfaces for drm+crypto""