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

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



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