Refactor EXTRA_PACKAGE_NAME to a generic string

Bug: 170595479
Test: manual test
Change-Id: I178a453ada939c1cbd241e4efae4133ff7062ccf
1 file changed