Clean up packages/modules/Gki am: dfb8d4b52a am: 1dcb982f4d am: fa50d143da am: 463fbba495 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/2193802 Change-Id: I560c48538c97a114c250b0570a3bc7c24a0ced2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>