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

Change-Id: I7aaceff0646a5e738ed862c34645e548aabf62f1