[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into pi-dev am: 40450028aa -s ours am: 5dff4b6bf2
am: a7b216aaac

Change-Id: I147cd20999791659cc7fce5b6284f10796c8f570