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

Change-Id: I4bd9d710d5c1875974be9d26fa33ed7b7f8bdc4c