Add null check for subInfo

Bug: 387389548
Test: manual
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4f6188d25779f90a50d2858d1760f976cd9ecff2)
Merged-In: I8eb3b6c2d810dd667331e212da6f6a39b63d0a6d
Change-Id: I8eb3b6c2d810dd667331e212da6f6a39b63d0a6d
1 file changed