Merge "Add lane guidance and maneuver from content resolver" into qt-dev
am: dbca112faa

Change-Id: I36c7d7d7ecc50730d1a427bec498f820dab80f0e