Add some tests back which were removed for fixing kotlin nullable errors

Followup CL for aosp/2700076

Bug: 296972712
Test: build with aosp/2688146
Change-Id: I617b330c42a99e4c839adac2ea614756b5955ce9
3 files changed