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

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



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