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

Change-Id: I9a742c5b909b88dadbacaa75cc28348060219e35