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

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



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