[automerger skipped] Merge "Delay appop revocation when only capability is...

[automerger skipped] Merge "Delay appop revocation when only capability is lost" into udc-dev am: af2f33e7 am: ae2aa397 am: 71c606ed -s ours

am skip reason: Merged-In Ia23c0f5b79fa194539151ffbd04a36891e06361b with SHA-1 c1b8ec5b is already in history

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



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