[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: a9533dcd62 am: 84343cfa93
am: 060def8608 -s ours
am skip reason: subject contains skip directive

Change-Id: I55d1b6622a530e642720abdfced4d81933802083