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

[automerger skipped] Merge "Cleanup in EmulatorClipboardMonitor (1)" into tm-dev am: 5a68801f am: 521ba06c -s ours am: cd11ba83 -s ours am: ce9c4954 -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: Iff6f20fc93bdf87b3e1580701e161c7b4aa89d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>