Merge "Reduce visibility on PackageDexUsage methods." am: d7fe73d3b3 am: 7d86fc293b
am: ed5362ac73

Change-Id: I2296118d830391fd9d9af5cdad99afae4f7aa43f