[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: d3e5c766a1 -s ours
am: 703392e548

Change-Id: I3ee1977f9a1a0276dbe1e4490ba9c0c2c06cac1f