[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 9e4be5ae18 am: a801577071 am: ae5671bb79 -s ours
am: 03f854fddd -s ours
am skip reason: subject contains skip directive

Change-Id: I610addb7b8282f869f7546548df1e960ae254ed4