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