Merge "Android: Remove #ifdef ANDROID_P2P from wps_registrar_remove_pbc_session"