Merge "SKIP_IF_BPF_NOT_SUPPORTED is a no-op" am: cedb52b424 am: 0f53b0f76d am: 4dab886ada

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If07d08ca78f096cf9a3aa76c3d915fad454796ac