Merge "[Bugfix]create different pendingintent via appwidgetId" into tm-qpr-dev am: ad083ddb85 am: 3f5ec98abe

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

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