Always select the next higher density bucket when picking resources

This reverts commit 30715f3a.

Reason for revert: roll forward with fix

Change-Id: I6d63e6fa508501f2d029eeb4647d4d70c152ceb3
Test: ran all previously failing tests locally
Fixes: 183136881