Merge "Make sure stickies get resent from the same UID." into udc-dev am:...

Merge "Make sure stickies get resent from the same UID." into udc-dev am: f45c4830 am: a7d2c108 am: 68b233cb

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



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