Merge "Show notification when network logging is enabled"

diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge

diff --cc core/res/res/values/strings.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
Simple merge

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 4d3a35e,4d0f5c7..050f25d
--- 1/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
--- 2/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@@ -17,8 -17,8 +17,9 @@@
  package com.android.server.devicepolicy;
  
  import static android.Manifest.permission.MANAGE_CA_CERTIFICATES;
+ import static android.app.admin.DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG;
  import static android.app.admin.DevicePolicyManager.CODE_ACCOUNTS_NOT_EMPTY;
 +import static android.app.admin.DevicePolicyManager.CODE_ADD_MANAGED_PROFILE_DISALLOWED;
  import static android.app.admin.DevicePolicyManager.CODE_CANNOT_ADD_MANAGED_PROFILE;
  import static android.app.admin.DevicePolicyManager.CODE_DEVICE_ADMIN_NOT_SUPPORTED;
  import static android.app.admin.DevicePolicyManager.CODE_HAS_DEVICE_OWNER;