Merge "Correct NMEA DTM implementation am: 6b6e2e01e8 am: cf18b1a5da" into sc-v2-dev-plus-aosp