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

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

Change-Id: Ia1ae97bda2352fc488d4dc13b9c9e95e3d6f3fbf