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
am: f0443a1d
Change-Id: Icc3b7f4e5502cd386be3bad7f3fdd06d44244bfd