Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e6921 am: 0db2c732...

Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e6921 am: 0db2c732 am: c92d8238 am: 053feadc

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



Change-Id: I6dc838e027a2e29a2494b4cd0d932d764c45749b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>