Merge "dumpstate: fix retention of CAP_SYSLOG after dropping root" into main...

Merge "dumpstate: fix retention of CAP_SYSLOG after dropping root" into main am: a11f5b1c am: a013922e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3278331



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