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: I7d6e5a2cb1d3f537906975c892e2c3eb3705679c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>