Allow enabling or disabling a previously installed GSI as non-root. am: b5f44b3cf3
am: 3ad20ee34e

Change-Id: I65eecbcc36c41b261cb719739ea0b290dc1c2046