[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
am: 4181f7daf7

Change-Id: I21be023592412b2c052335ca5b0f191a48d4d3f6