chore(android): Merge branch 'fix/android/updatekmp-logic' into fix/android/cloud-catalog-for-local-test