Merge "Fix queryRawContactEntity api" am: b0914ffd45

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

Change-Id: I7583c066ffb2d0403167f26c385c40c81d80ef15