Merge "Add FLAG_UPDATE_CURRENT flag when creating app bubble pending intent" into udc-dev am: ee8b87bd99 am: b2fcd99df8

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

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