Only call keystore if outInfo is not null (cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c) Bug: 8568820 Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
Only call keystore if outInfo is not null (cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c) Bug: 8568820 Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28