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

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

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