Fix migration from pre-O for AndroidTV devices (2/2)

Change-Id: I81fb44cb18c081d61cab5743b7a1176e6a8fe422
1 file changed