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

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

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