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: cd3d95b1 am: 4b81cf16 am: 84f84c73

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



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