Merge "Fix serialization bug in GpsNavigationMessage" into rvc-dev am: 97ed8d63 am: 138e5f3f am: b89e6e04 am: b0e56147

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

Change-Id: I26cb370c2a0e69f3dcc5630a35bdb8f533f08eac