[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: 9d4c65cd am: a9b6f95d am: 7a9e9e09 -s ours
am skip reason: Change-Id I4258312c19aa4f2f0cd178bc5b5dc53e52c6c737 with SHA-1 a8b2beb5 is in history
Change-Id: I49ba7ff6adfd1a188df2e6a81c15592ca36fcbea