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

Change-Id: I355aa28d9f16a4882c723803de29a07d05704ca7