Merge "Add Stable AIDL interface for DRM service"