Merge "Do not set FLAT_BINDER_FLAG_* on object of type BINDER_TYPE_FD" am: cbb975dcef am: 8969522cdc

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

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