[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter."" into oreo-cts-dev am: eee700f5 -s ours am: d04f8f48 Change-Id: I6b723744a915cbc4453ab167efb3bf3e96bbf691