Merge "Add clipboard source to edit image intent" into tm-dev am: 0c442083 am: d7cf4c90 am: f15f6f6c

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



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