[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: d3e5c766a1 -s ours am: 703392e548 am: 9586551095
am: 03dfd0399a

Change-Id: I9ce4a23ac2d99ea4b87aa0c4eebb3444e5859ad4