Merge "Fix serialization bug in GpsNavigationMessage am: a1b42970 am: fb37bba7 am: 720c338b am: 6a9fff70" into sc-dev am: b9898b5b am: e7af326c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878935

Change-Id: Icf53775995f7e43103bff4adc92308ae519226db