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

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



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