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

Change-Id: Idc0853955bc89032bc9a5702bf6e67bdb47164f5