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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieba44748bfc96281052a1b90f464e79d40abe437