[automerger skipped] Merge "Check for IOCTL feature changed to not set inheritence" am: 2af771c3ba am: 541fdb3d9a am: cb7b7c1fb6 -s ours

am skip reason: Merged-In Ia5baf127af5a078592d8b2db4b2f3d8c048a8692 with SHA-1 c18afa8af7 is already in history

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

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