Merge "Rename VEHICLE_AREA_TYPE_NONE --> VEHICLE_AREA_TYPE_GLOBAL" into pi-dev am: f131154914
am: a14d188f37

Change-Id: Icd47147f32c5a3a44c756d59f7944ec497b419e6