Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae am: c46a977d am: eb9b01e0

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

Change-Id: I4527586e27b4897f5e57c3c52cac151e83dc0409