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