Merge "Refuse to adopt shell permissions if they were already adopted." am: f99a80501d

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2130232

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