Merge "limit extra fds in random parcel" am: 6e5dda51cd am: 83eb929526 am: b031f905d7

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

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