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

Change-Id: Ia6ba75b4938ab6d9ec0ffe1bc39b6ce6995a808e