[automerger skipped] Define new atoms for Vehicle Maps Service.
am: b01c08d0a6 -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 8a4a9989fc is in history

Change-Id: I346c9fdaef7c545f851d6899bee488bd1a54d72e