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

Change-Id: I59551190983a1b4c72f519882474378e54d1c8ca