Merge "Merge "p2p: reset response object before using it" into android11-tests-dev am: 00a6e26599" into android12-tests-dev