Merge "fix sensor type comparison between car lib and support lib" into oc-mr1-dev am: 40b765208c
am: d42759e8ff

Change-Id: I3d7e7ea88c883630aa0766aa221a7b84dfa0d37f