[automerger skipped] Cleanup in EmulatorClipboardMonitor (3) am: a5f8393d76 -s ours am: 48aeb313ce -s ours

am skip reason: Merged-In I236b039c4fbbbfb519ba1432326bba9a89d008c2 with SHA-1 853dd7d2b6 is already in history

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

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