Merge "Fix hidl p2p network register & notifyStaApAuth" into oc-dev