[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: 28f2676f -s ours
am skip reason: Change-Id I4258312c19aa4f2f0cd178bc5b5dc53e52c6c737 with SHA-1 0bec8d43 is in history
Change-Id: Ie554eb0207703d01da8e2faba0d0ac774eee76c6