[automerger skipped] Merge "Enforce strict grammar when querying the call log" am: 1dc2110ac2 am: e98011c606 am: 1d653a6122 am: d5beeb0c33 -s ours

am skip reason: Change-Id I54d2d399f449ea47aa8fb4197c718f9038da25bf with SHA-1 008f8bfa9d is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/1414046

Change-Id: I6719c6431b15338eae1b68b8e7b017bf2ce720ab