[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter."" into oreo-cts-dev am: eee700f547 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ad638a452ee7163ef6013c037a86f67ae7bc698