Merge "[Media ML] Copy over ActivityManager#handleIncomingUser"