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

Change-Id: I80528a71e90049489b85b5c95baf93cbd3a17808