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

Change-Id: Icab8b2cab7783d443df3b454e81d5cadd1d5b844