Merge "Clear apex.go entries for bluetooth libs" am: 059a174baf am: bc7c93c276

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2010755

Change-Id: I08610ba50ec261c25501ab7bf9f8c28c9a68d38c