Merge \"Don\'t walk mutexed collections outside the mutex\" into nyc-mr1-dev

am: b9c057c316

Change-Id: I51a2f7324e96327a1d5e2f826544f03309412081

services/core/java/com/android/server/AlarmManagerService.java

@@ -2547,7 +2547,9 @@ class AlarmManagerService extends SystemService {
                 } else {
                     // Just in case -- even though no wakeup flag was set, make sure
                     // we have updated the kernel to the next alarm time.
-                    rescheduleKernelAlarmsLocked();
+                    synchronized (mLock) {
+                        rescheduleKernelAlarmsLocked();
+                    }
                 }
             }
         }