Merge "[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: d3e5c766a1 -s ours am: 703392e548 am: 9586551095 am: 8fbb6bd66d" into qt-qpr1-dev-plus-aosp