[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: 74c25744ee
am: 01e625c3be -s ours
am skip reason: subject contains skip directive

Change-Id: I68a9fc55864ba83eae26bc8735eed518270dfcd8