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: 05eb9807 am: 8737dc5f

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



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