Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev

            final ActivityServiceConnectionsHolder holder =

                    (ActivityServiceConnectionsHolder) connectionHolder;

            synchronized (ActivityManagerService.this) {

                synchronized (mProcLock) {

                    holder.forEachConnection(cr -> mServices.removeConnectionLocked(

                            (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,

                            false /* enqueueOomAdj */));

                }

            }

        }

        public void cleanUpServices(int userId, ComponentName component, Intent baseIntent) {

            synchronized(ActivityManagerService.this) {