Clean up packages/modules/Gki am: dfb8d4b52a am: 1dcb982f4d am: fa50d143da am: 463fbba495 am: bfaecc580a

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

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