Merge "Apply pending-intent op before blanket locktask check" into udc-dev am:...

Merge "Apply pending-intent op before blanket locktask check" into udc-dev am: 0e875249 am: e901bc15

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



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