Merge "Reduce visibility on PackageDexUsage methods."
am: d7fe73d3b3

Change-Id: If0eb85a1f78eb8aa0117eb1a9573069b60ae0e9a