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

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

Change-Id: I5d41711ac36117214e13a19b68b432fa27d120cb