Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae am: c46a977d

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

Change-Id: I5d74631545693a8b92c0d534b29046856fbfece0