Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4

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

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