[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: a7cb68e1df -s ours
am skip reason: Change-Id Ifedc4e6f120e711aadffdf715d8720e0b64fbe16 with SHA-1 06a551ee7b is in history
Change-Id: I3ab56023ba7a82f865a37de947fe36a38234500a
This commit is contained in: