Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev...

Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92 am: a0237b2e am: 7d8fd7a9 am: b4ce1ebb am: 995bb7e3 am: d0f9d226 am: 647716eb am: 8ce8e5e1 am: 80b7a1b3 am: 96d98d94

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



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