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

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

Change-Id: Ie11ca71eb219df16d5ca84110d59e4346b006706