Merge "Allow revoked capabilities to be restored in sharedUserId lineage" into...

Merge "Allow revoked capabilities to be restored in sharedUserId lineage" into tm-dev am: 80af2fac

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



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