Fix more kotlin 1.7.0 errors

Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.

Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
(cherry picked from commit 64acfee25d5d38d92267238a7847cccfccd2e829)
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941
4 files changed