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

[automerger skipped] Merge "Cleanup in EmulatorClipboardMonitor (1)" into tm-dev am: 5a68801f -s ours am: 02c85af0 -s ours am: d0acb662 -s ours am: 263aab5c -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: I3d17ee3ba8e562b933e3242ddbbcaed5864f3d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>