resync with AOSP master

Merge conflict resolution patch 11a29f29
inadvertently dropped a comment line. Pick it back up.

Change-Id: I0f7a7cdbdacafb86610595ee616e84a06da50a17

te_macros

@@ -368,6 +368,7 @@ define(`service_manager_local_audit_domain', `
   typeattribute $1 service_manager_local_audit;
 ')
 
+###########################################
 # use_drmservice(domain)
 # Ability to use DrmService which requires
 # DrmService to call getpidcon.