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 am: 0e76cd74

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



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