[automerger skipped] Cleanup in EmulatorClipboardMonitor (4) am: 09b78c40 -s ours am: b9cd1015 -s ours am: 16c85ad3 -s ours am: 3c7adf04 -s ours am: a1abd95a -s ours

am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 73cc189a is already in history

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



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