Merge "Check for IOCTL feature changed to not set inheritence" am: 2af771c3ba am: 541fdb3d9a

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

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