Revert "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter."

This reverts commit 6be026441473468658fe33367e1cfea99432be4b.

Reason for revert: b/148087431
Bug: 148087431
Change-Id: If2e30f4123f5add54265158bf7eb9c733041fac4
1 file changed