Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" into android13-tests-dev