[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: 70c2a12d -s ours

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

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



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