Merge "Add entity uri field to Eab provider" am: cb2d34eeef

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

Change-Id: I48abe850d9d81fe2628167b1053a34a23987a2c7