[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter."" into oreo-cts-dev am: eee700f5 -s ours am: d04f8f48 am: a2efaec2 am: fd3f3d69 -s ours am skip reason: subject contains skip directive Change-Id: I41fd5588b193483382345e05b7a3762cf93c7107