More robust abusive GROUP BY recovery logic.

With tests to verify based on WHERE clauses we've encountered in
the wild.

Bug: 113651872, 113652519, 115340326
Test: atest MediaProviderTests
Change-Id: I58a02f79b834e21eabb021831918965ce3eb6404
2 files changed