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

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

Change-Id: I0b1d5b1275bf3051fdbd07140b7195bc564d7a4d