Merge "autofill save: do not focus on custom sub title for TV" into pi-dev
am: ba96b97aab

Change-Id: Ia2726c6f4513c6a17e9eaa1b75af67405e71aa49