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

Change-Id: Ida9e5aad5a8f1d931932f32ab458d3b7b89767ce