84062d4b5d
This reverts commit 3a4f503e5d.
Reason for revert: need TouchInteractionService to be direct boot aware for the merge
Change-Id: I5b3c651df77f8df1d5f07245b062f2384cd760a0