Merge "Fix ClipboardService's auto-clearing where wrong uid was being used."...

Merge "Fix ClipboardService's auto-clearing where wrong uid was being used." into tm-dev am: 253a4429 am: e37b7bb4 am: 11b8cbe3

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



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