Merge "Revert "Convert PRODUCT_COPY_FILES for keyboards data to Android.bp"" into main