Merge "Revert "Throw IAE when crypto or descrambler is not given for secure codec"" into oc-dev am: 27f6dfc43c
am: c3c56ad876

Change-Id: I085aae3f8c1da0f832b3718142bbedd4170c2d86