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

Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b