This reverts commit bff33b8c31.
Reason for revert: cts tests on -user builds is broken
Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978
Merged-In: I2edf200561f839e49e067403714ea6fa65bdc978
This reverts commit bff33b8c31.
Reason for revert: cts tests on -user builds is broken
Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978
Merged-In: I2edf200561f839e49e067403714ea6fa65bdc978