Causing deadlock in system-server Bug: 70238465 Bug: 67862696 This reverts commit 453e7c1c. Change-Id: I9d37ff303dee577c36283ccd50f134abd76b556a