Merge "Merge "Merge "Fix serialization bug in GpsNavigationMessage" into...

Merge "Merge "Merge "Fix serialization bug in GpsNavigationMessage" into rvc-dev am: 97ed8d63 am: 138e5f3f am: b89e6e04 am: b0e56147" into sc-qpr1-dev-plus-aosp am: 01059b60" into sc-v2-dev-plus-aosp am: 4ff50609

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

Change-Id: I06e7ba4523ecaa0b1bce49946cb0982b0c3aa4ce