[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab am: b0054f0518 am: c97dfb57a8 -s ours am: 40a236db41 -s ours
am: b3c4ddb61e

Change-Id: I4fbf580a4e5d17c8ceb7fcd9176a048f9accfc19