Merge "Clean up ClipboardOverlayController after tests" into tm-qpr-dev am: 584274c3

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



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