Merge "Use requesting userId for ApplicationInfo lookup"