Merge "Fix serialization bug in GpsNavigationMessage" into sc-dev am: 89b745e016 am: a65fd85bbf

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

Change-Id: I452530e355f7f37ca35b05c38fda24a0d6d018d4