Add isGsiEnabled to GsiService am: 670b3068f9
am: 4a13ee021b

Change-Id: I3021ab0f896e4611d807594aa2d1b739044b0999