[automerger skipped] Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android...

[automerger skipped] Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b401 am: c648a4eb -s ours am: 676f1558 -s ours am: a7cb68e1 -s ours am: bd03fddc -s ours
am skip reason: Change-Id Ifedc4e6f120e711aadffdf715d8720e0b64fbe16 with SHA-1 06a551ee is in history

Change-Id: Ief7801c4488162fc109531561d83b9829b6c87bd