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

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



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