This reverts commit f1e67364. Reason for revert: crashes system server Bug: 77176207 Change-Id: I574e6e1f60d83f14701a643a1c7b8f7ef8659ed5