Merge "Fix serialization bug in GpsNavigationMessage" into rvc-dev am: 97ed8d6385 am: 138e5f3fa5 am: b89e6e04cf am: b0e56147ac am: 6dd7c30191

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

Change-Id: I8706d024f535a8b77b01f60c1da4ba9f3460961b