Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37fdf am: ebcaae3d45

Change-Id: I14cdc5276654d821e4e08ab08795fecd2031d4a5