Merge "Grant VTS tests all permissions in keystore on userdebug/eng"
am: 3ed33f4013

Change-Id: Ifc0ab235cdb4d959a4f55b6c9df1835b9c6a7e2d