Revert "Revert "Always select the next higher density bucket when picking resources""

This reverts commit 932970c6.

Reason for revert: roll forward with fix

Change-Id: I42ff7cdee2ed84b55b25fbbaa68525fed43ebd9b
Test: updated and ran the failing test locally to confirm fix
Fixes: 183136881