Merge "Add two enums for TvSettings App settings" into rvc-dev am: ec2c313a22 am: 76909188d0 am: 60c60a97a2 am: 721dd5174d
Change-Id: I85fcac668c13a0a47bf87c1d03ca995297863104
This commit is contained in: