[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
am: 29d4d347da

Change-Id: Ic9312ce773a89c64e28655ed8de9fba3abe318e1