Merge "Delay appop revocation when only capability is lost" into udc-dev am:...

Merge "Delay appop revocation when only capability is lost" into udc-dev am: af2f33e7 am: ae2aa397

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



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