tree db825c2958db632c8baf8195cf15a94de1bd2b53
parent 93e43f1a98bccd6d1c99636989d12e95600ca076
parent eee700f5470652aed620c5b78607173d9b528f90
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581369466 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581369466 +0000

[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