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

Change-Id: I3cddb4a5ea4af86ce8d61fb283f9ac9c0e3eb62e