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

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

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