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

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

Change-Id: Ifc8b0e52636e808a29457f81230690b521f300c2