Merge "Add APEX UIDs to PackageManager query" into rvc-dev am: cb29fa9384 am: 0bf78c7e5b am: 9b2deabc0a am: a9cd4595de

Change-Id: Ic6068fd149b57f2e43706eee58c29204dc11afd1