Merge "Zygote: Fix dropping capabilities in containers" am: 71757726 am: 03c4abdb

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



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