Add null checking to fix NullPointerException while creating mock tag

Bug: 221452261
Test: Test pass
Change-Id: Ie64df0d8d291468b258f92524af10da504c7dade
Merged_In: Ie64df0d8d291468b258f92524af10da504c7dade
(cherry picked from commit dbdc1bd3c7d53734bf4501e131bb50921f547a7f)
1 file changed