Fix NPE during restore

This CL was cherry-picked from aosp master branch to fix cts.

Test: atest, manual restore
Fixes: 192325449
Bug: 206476700
./cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.IncidentdTest
Signed
Change-Id: I52d230aa9534a12b35da82dc8fd8449732812511
Signed-off-by: Artem Radchenko <artem.radchenko@globallogic.com>
1 file changed