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

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



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