Merge "Rename biometric_prompt_service to biometric_service" am: 7087bf12

am: e230d6dd

Change-Id: I8ebfcc623d2a9221f67626da87e8613afb639c58

private/compat/26.0/26.0.ignore.cil

@@ -9,7 +9,7 @@
     app_binding_service
     atrace
     binder_calls_stats_service
-    biometric_prompt_service
+    biometric_service
     bootloader_boot_reason_prop
     blank_screen
     blank_screen_exec

private/compat/27.0/27.0.ignore.cil

@@ -8,7 +8,7 @@
     app_binding_service
     atrace
     binder_calls_stats_service
-    biometric_prompt_service
+    biometric_service
     blank_screen
     blank_screen_exec
     blank_screen_tmpfs

private/compat/28.0/28.0.ignore.cil

@@ -6,7 +6,7 @@
   ( activity_task_service
     adb_service
     app_binding_service
-    biometric_prompt_service
+    biometric_service
     fastbootd
     color_display_service
     hal_health_storage_hwservice

private/service_contexts

@@ -18,7 +18,7 @@ batteryproperties                         u:object_r:batteryproperties_service:s
 batterystats                              u:object_r:batterystats_service:s0
 battery                                   u:object_r:battery_service:s0
 binder_calls_stats                        u:object_r:binder_calls_stats_service:s0
-biometric_prompt                          u:object_r:biometric_prompt_service:s0
+biometric                                 u:object_r:biometric_service:s0
 bluetooth_manager                         u:object_r:bluetooth_manager_service:s0
 bluetooth                                 u:object_r:bluetooth_service:s0
 broadcastradio                            u:object_r:broadcastradio_service:s0

public/service.te

@@ -84,7 +84,7 @@ type dreams_service, app_api_service, ephemeral_app_api_service, system_server_s
 type dropbox_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type lowpan_service, system_api_service, system_server_service, service_manager_type;
 type ethernet_service, app_api_service, system_server_service, service_manager_type;
-type biometric_prompt_service, app_api_service, system_server_service, service_manager_type;
+type biometric_service, app_api_service, system_server_service, service_manager_type;
 type fingerprint_service, app_api_service, system_server_service, service_manager_type;
 type gfxinfo_service, system_api_service, system_server_service, service_manager_type;
 type graphicsstats_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;