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

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

Change-Id: I46499071a6b68ec4749defc1bc8a376942c85ca4
Signed-off-by: Automerger Merge Worker <[email protected]>