[automerger skipped] Merge "Cleanup in EmulatorClipboardMonitor (2)" into...

[automerger skipped] Merge "Cleanup in EmulatorClipboardMonitor (2)" into sc-v2-dev am: 234b3363 -s ours am: 0b3c4188 -s ours am: 33dac9a8 -s ours am: 9c1bb3c6 -s ours

am skip reason: Merged-In I5241086c947a4227fb32648f0693303be66f4d46 with SHA-1 52e2733e is already in history

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



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