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

Change-Id: I9a338210251a33fbe3827290b0826615158f7b0f