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

Change-Id: I5ba9d47544386972b015d53d8e5f3a1fa64a1bfd