Merge "Update tv flavor default hw property to something desired."
am: 983f4e66f8

Change-Id: I4a307554f5240a25db6e4c5df89dc7bf373c9634