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

Change-Id: I47ceda8fc3785c0edb49d95790edff88332a84cf