[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into pi-dev
am: abb84003e8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9a6c8887dbbeea2f1ddb38df4b4bcd92e795e79