Merge "Revert "Convert keyboards artifacts to soong"" into main am: ca3da5d19c am: 4d2250c793

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3073844

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