Merge "media: fix encrypted buffer handling" into rvc-dev am: 33db90860f

Change-Id: I0cacadd7d6118315baa2923d97bc6f4f5bb990c8