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

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

Change-Id: I39d0d03036bac02f1601f6bc21d138a64e37d202