Merge "Add com.android.uprobestats to apex_available for libbpf am: ab31071520" into main-kernel