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

Change-Id: Ic0ee27db76573942864abd12cbc7472747961f38