Merge "[NETD-BPF#11] libgpumem includes WaitForProgsLoaded.h" am: 15779c238f

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

Change-Id: I927168d64d28d601eee7b0ababf1b4ceb1905215