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

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

Change-Id: Id40fdb8522a5c852476333b9dfaf89275b4956a8