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

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

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