Merge "Define non gms and deprecate gms slot reservation constants" into pi-car-dev
am: 1f07bef113

Change-Id: Id1902762061b7658904ca10ce172efb1021875f9