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

Change-Id: Id95f5c8fae4f04794d7c5ac6b5524400b423745d
diff --git a/prebuilts/api/31.0/private/system_server.te b/prebuilts/api/31.0/private/system_server.te
index 82b2a1f..22623c4 100644
--- a/prebuilts/api/31.0/private/system_server.te
+++ b/prebuilts/api/31.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 82b2a1f..22623c4 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