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

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

Change-Id: I0a2ae2a4bf1dbf24f794b3d45b43ba821f336830