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

Change-Id: Ibe3d5c509756932c99757a4f745ab9f948f671f7