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

Change-Id: Icd99f07df0b57d2fae995e791512a78c9810192f