Merge "Fix build breakage by removing duplicate definition of GNSS_NAVIGATION_MESSAGE_TYPE. am: 195aed2bb2 am: 88dbb1d92f am: 00a3cadad0" into nyc-mr2-dev-plus-aosp