[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06 am: 3543522564
am: 775b8adf7b

Change-Id: I835e777e7e6bee5e91bfa729d095f8b6f0653c43