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

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

Change-Id: Iab79cf0eeffd6a7d679237cc0ab985711cce25ec