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

Change-Id: I6227536c270cdac730be60edf35f7ff704e59af0