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

Change-Id: I88b61c01bc584a69dd248595e27e872cc9480fd3