Merge "Treble HAL interfaces for drm+crypto"