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

Change-Id: I6e40ee23191431ee4daf49ed1dca1948167cbccc