Cleanup on async disconnect and finalize

Bug: 7326726
Change-Id: I6cca47a70cc0f29c68f922618cdcc181fb919a05
1 file changed