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: 3a0d423c

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



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