Merge "[Bugfix]create different pendingintent via appwidgetId" am: 71a5559a8b

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

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