Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.
Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
(cherry picked from commit 64acfee25d)
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941