Merge "Revert "Throw IAE when crypto or descrambler is not given for secure...
Merge "Revert "Throw IAE when crypto or descrambler is not given for secure codec"" into oc-dev am: 27f6dfc4
am: 1b72c28d
Change-Id: Ic6c3509ed30f18128b368df98dbb1404e04b2897