Merge "[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues" am: 09dcaf1948
am: 744f0e0997

Change-Id: Ib2d02a9a5a04256120c7982b0e1d6298a5d197dc