[automerger] Nullcheck to fix Autofill CTS am: 6c68a692 am: 743abb93 am: a99414f5 am: 6b955039 am: 9e291fe8 am: 97f7498c Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f