Merge "limit extra fds in random parcel" am: 6e5dda51 am: 83eb9295

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



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