Clean up packages/modules/Gki am: dfb8d4b52a am: 1dcb982f4d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/2193802

Change-Id: Ia742fb4c413100c0479825a630eb8ff85e2c948d
Signed-off-by: Automerger Merge Worker <[email protected]>