Merge "Merge "Fix serialization bug in GpsNavigationMessage" into rvc-dev am: 97ed8d6385 am: 138e5f3fa5 am: b89e6e04cf am: b0e56147ac" into sc-qpr1-dev-plus-aosp am: 01059b60f4

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

Change-Id: I5c73a202675476fa406099e63a0f4082b9cd356f