Merge "Fix serialization bug in GpsNavigationMessage am: a1b4297002 am: fb37bba744 am: 720c338bcb am: 6a9fff7078" into sc-dev am: b9898b5b1b

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

Change-Id: I649c8d1dec3101f111c83a9eb400038c0c37800f