Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: I8414a7ce45ca19eeb2beb87283d7c77dba84f336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>