Revert "comply with VTS requirements"

Revert submission 22302106-dumpstate aidl

Reason for revert: build failed on udc-d1-dev

Reverted changes: /q/submissionid:22302106-dumpstate+aidl

Change-Id: I4b786f509b80113ca2acf2e1055808c084d1f9bb
6 files changed