Merge "Improve exception in validate{Apex,Apk}InstallLocked" into rvc-dev am: 7f636ea3de am: 84604cb8ca am: 34a6a90b66

Change-Id: I080f385a19328bea4c7577d1dea7e5b28900b939