Add packageName argument in preparation for per-package lock.

Bug: 201090222
Test: presubmit
Change-Id: Iacee77bf52ed9bb96b425c42de2432ade7c79797
7 files changed