[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours am: 2ccbb35723 -s ours
am: 79c2faf372

Change-Id: Ic3f1646d160f539faae4507c736dd3f5ce394616