[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18

Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f