AudioFlinger: Disable (revert) LockWatch am: deb0335714 am: d8d2728947
am: 5d819b4794

Change-Id: I4754604909ec4658aa3d12e70dbb735e34955901