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

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



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