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

Change-Id: I3d5164b06b786a773e5d549d640a12e5b70c012a