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

[automerger skipped] Merge "Cleanup in EmulatorClipboardMonitor (2)" into tm-dev am: ddd9f922 am: 510313cd -s ours am: 62e7455e -s ours

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

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



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