[automerger skipped] Merge "Add atom of TvSettings and its enum" into rvc-dev...
[automerger skipped] Merge "Add atom of TvSettings and its enum" into rvc-dev am: e31edc21 am: 3cdcd62e -s ours
am skip reason: Change-Id I4258312c19aa4f2f0cd178bc5b5dc53e52c6c737 with SHA-1 0bec8d43 is in history
Change-Id: I7fdd69f9e1be54494ec6749f7c68fa33e20a50f7