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

Change-Id: Iad66984e3a462e3fdad7c5387d31671c31470fae