Merge "[automerger skipped] Cleanup in EmulatorClipboardMonitor (2) am: 14fa62c0 -s ours am: ff50ecff -s ours am: 98b0da59 -s ours am: 622f3b4f -s ours" into tm-d1-dev-plus-aosp am: b9b5631b -s ours am: 84624258 -s ours

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

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



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