Merge "P2P: Fix ApSta auth/death with null p2p_dev_add" into oc-dev
am: 62c469414b

Change-Id: I8be6438ff524bc752d4ae3d6df6bef64ca711d4b