[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into pi-dev am: abb84003e8 -s ours am: 74e800be1a am: 71cb21b6db
am: 1e18944f8a

Change-Id: I28fd77bc16df798e63333e5e9f4e66ed8b913825