This reverts commit bff33b8c. Reason for revert: cts tests on -user builds is broken Bug: 147113465 Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978