[automerger skipped] Merge "Define new atoms for Vehicle Maps Service." into qt-qpr1-dev-plus-aosp
am: 34af7a8d01 -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 a824a64be1 is in history

Change-Id: Ief31d7fa4ba2bcce1908711789f80f4b6591f50b