[automerger skipped] Merge "Create pending intent for specific user" into...

[automerger skipped] Merge "Create pending intent for specific user" into udc-qpr-dev am: bf5ae98c am: 6f8ddcb5 -s ours

am skip reason: Merged-In If03e146a069b9162d41eee26b7070ea52827fddf with SHA-1 b9c5b0f4 is already in history

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



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