[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
am: d3e5c766a1 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d1d26c7f58e6ab263d642d75403d51240a0429b