[automerger skipped] Merge "Update packages to not depend on maps SDK v1."...
[automerger skipped] Merge "Update packages to not depend on maps SDK v1." into rvc-dev am: eb354ce7 am: 2c587381 am: a374f669 -s ours
am skip reason: Change-Id I3d9db099200955204dfdc67c3457f74d759b454e with SHA-1 a526b1ee is in history
Change-Id: Id936c7ffb21de6f5e5f56279fdbbfff2c5cf8a1d