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

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

Change-Id: I590247c74f8c31b713afd92e119cd820819c7cb8