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

Change-Id: If7a01b114a30c27f341b78e35e113178e1174e27