Merge "Add two enums for TvSettings App settings" into rvc-dev am: ec2c313a22 am: 357325a35f am: 8e27b8dd2c am: 9ccb81a0fa
Change-Id: Ia2a90e11c46fc6f9983a41a72d2207f144ec8c75
This commit is contained in: