[automerger skipped] Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b40158 am: c648a4ebd0 -s ours am: 676f155839 -s ours
am skip reason: Change-Id Ifedc4e6f120e711aadffdf715d8720e0b64fbe16 with SHA-1 06a551ee7b is in history

Change-Id: I509a0f5ab852be57928ae076c32a0faddbd01fc1