[automerger skipped] Merge "Update packages to not depend on maps SDK v1." into rvc-dev am: eb354ce78c am: 0c5b3aa26b am: e66b2e8c99 am: ada6dbd7ed am: 49cace64d3 -s ours
am skip reason: Change-Id I3d9db099200955204dfdc67c3457f74d759b454e with SHA-1 8ce94b1ef2 is in history
Change-Id: I707ed47cabb3b5a119872102abf83a9646b10c58
This commit is contained in: