Merge "Remove underscore from Companion service name" into oc-dev

am: 364644eb Change-Id: I83410880ad404a5cabd5d7ec287f5d538110556e

Merge "Remove underscore from Companion service name" into oc-dev
2cad0f48 · Eugene Susla · android-build-merger · 68266d06 · 364644eb · 2cad0f48
Commit 2cad0f48 authored Apr 25, 2017 by Eugene Susla Committed by android-build-merger Apr 25, 2017
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -22,7 +22,7 @@ com.android.net.IProxyService             u:object_r:IProxyService_service:s0
 commontime_management                     u:object_r:commontime_management_service:s0
 common_time.clock                         u:object_r:mediaserver_service:s0
 common_time.config                        u:object_r:mediaserver_service:s0
-companion_device                          u:object_r:companion_device_service:s0
+companiondevice                           u:object_r:companion_device_service:s0
 connectivity                              u:object_r:connectivity_service:s0
 connmetrics                               u:object_r:connmetrics_service:s0
 consumer_ir                               u:object_r:consumer_ir_service:s0