Merge "[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" into oreo-mr1-cts-dev