[automerger skipped] Merge "Add ScreenshotEvents for screenshot for notes from...

[automerger skipped] Merge "Add ScreenshotEvents for screenshot for notes from master to tm-qpr-dev." into tm-qpr-dev am: 1daff5b6 am: a3ab1c78 -s ours

am skip reason: Merged-In I6e9cfa0c54b1999a95a6f2260f23f6605f5f90a5 with SHA-1 24849ab1 is already in history

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



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