Merge "Fix serialization bug in GpsNavigationMessage" into rvc-dev am: 97ed8d6385 am: 898fd533e3 am: 5e8756470f am: 6e7cd253e5

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

Change-Id: Id9cdaa83d1c1bb0c54b1780c8fce8bfe3647182d