Add additional Kotlin to Java type conversion

Bug: 175421911

Change-Id: I9362fe8b4b12eed0f665172f9e4433b21beb1ac2
82 files changed