Merge "Fix queryRawContactEntity api" am: b0914ffd45 am: 722b3172ff am: 67b73c4b5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863059

Change-Id: I40c01c8a77842c435b8380fd589a317aaf56abe9