[automerger skipped] Merge "Merge "Update packages to not depend on maps SDK...

[automerger skipped] Merge "Merge "Update packages to not depend on maps SDK v1." into rvc-dev am: eb354ce7 am: 0c5b3aa2" into rvc-d1-dev-plus-aosp am: 5b9fea16 -s ours am: 17f18327 -s ours

am skip reason: Change-Id I3d9db099200955204dfdc67c3457f74d759b454e with SHA-1 a526b1ee is in history

Change-Id: I4d60d48a916be11e24dfe1db3dfedc70ba9c63b4