[automerger skipped] Cleanup in EmulatorClipboardMonitor (3) am: a5f8393d -s ours am: 48aeb313 -s ours am: b322c291 -s ours am: 11701d47 -s ours am: 48febcc2 -s ours

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

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



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