base

Fix issue #17609716: Frequent crash in system_server (RT restarts)

There was some code here locking on the lock object instead of
the main activity manager lock...!!!

Change-Id: Ic85151fbef915f6fb8fd5ce3c1a7e9b810412cb6