Remove unecessary locking to avoid dead lock.

Bug: 160252067
Bug: 173421434
Test: manual - switch to dsds multiple times to make sure no error
happens

Change-Id: I15def5c401811190f0f2ca8d1fa7e44d6387407e
Merged-In: I15def5c401811190f0f2ca8d1fa7e44d6387407e
(cherry picked from commit 93d5117c)