Merge cherrypicks of ['googleplex-android-review.googlesource.com/28159984'] into sc-v2-platform-release.

Change-Id: Ieff9b084c7972581723203c2788bbcd18c4bc4c3
diff --git a/prebuilts/api/32.0/private/system_server.te b/prebuilts/api/32.0/private/system_server.te
index 6aca000..00eb8c3 100644
--- a/prebuilts/api/32.0/private/system_server.te
+++ b/prebuilts/api/32.0/private/system_server.te
@@ -904,6 +904,7 @@
 	clear_ns
 	clear_uid
 	get_state
+	delete_all_keys
 	lock
 	pull_metrics
 	reset
diff --git a/private/system_server.te b/private/system_server.te
index 6aca000..00eb8c3 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -904,6 +904,7 @@
 	clear_ns
 	clear_uid
 	get_state
+	delete_all_keys
 	lock
 	pull_metrics
 	reset