Merge "Fix memory leak of FileDescriptorInfo object." into main am: 35c25d3665 am: 42ac4be27a

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

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