Merge "Zygote: Fix dropping capabilities in containers" am: 71757726 am: 03c4abdb am: 46a35810 am: 01a79642 am: ed2d80b2

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



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