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

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



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