[automerger skipped] Merge "Add userId to the package name API." am: dcc401b7b7 am: 443d3d0f11 am: ba20c10d2c
am: 96d504dc03 -s ours
am skip reason: change_id I92ea650b49743c388bff9943a7ec620e3d61a5d6 with SHA1 53bca9377d is in history

Change-Id: I93c8d829f88ec15bd4413bd8158a59c6c55bf0d7