Disable gms services as well

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:

	overlay/common/frameworks/base/core/res/res/values/config.xml
Code freeze for 3.1

liquid is going to push a few patches to frameworks and then we will be good to go