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: c3c56ad8
am: 3e9c2f1b
Change-Id: I590b8b9a343894428f0c89eeb1213f9e3953368e