Merge "ActivityManager: pass the main uid of the app to lmkd"