[automerger skipped] Cleanup in EmulatorClipboardMonitor (1) am: 225651dc -s ours am: b4aa2396 -s ours am: 16eab9b3 -s ours

am skip reason: Merged-In I3e96ab6ada8f0c892613a1f9dcc6b6ae12f6d73b with SHA-1 63596aaf is already in history

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



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