Add nullability annotations to state save/restoration

Bug: 110513685
Test: none
Change-Id: I570f0c5430ca29972d542e523a6d83ab567b4ed1
2 files changed