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

Change-Id: I18a747cffe5d81e10bbc5d63b95a36521883e933