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 am: 3ea014d0 am: 4043be4e

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



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