Merge "Fix serialization bug in GpsNavigationMessage am: a1b4297002 am: fb37bba744 am: 720c338bcb am: 6a9fff7078" into sc-dev am: b9898b5b1b am: e7af326c49

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

Change-Id: Icf53775995f7e43103bff4adc92308ae519226db