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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d3e3c219b10018367c0c03e868a98c6bb75cdda