Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66 am: b515796c3f am: 5555447a70 am: ef44568cfe

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

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