Merge "Add disableSelf() and more failure codes"

diff --cc api/system-current.txt
Simple merge

diff --cc services/core/java/com/android/server/attention/AttentionManagerService.java
index a8e99da,7b4ac6b..b447c53
--- 1/services/core/java/com/android/server/attention/AttentionManagerService.java
--- 2/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@@ -17,11 -17,10 +17,12 @@@
  package com.android.server.attention;
  
  import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE;
+ import static android.provider.Settings.System.ADAPTIVE_SLEEP;
  
  import android.Manifest;
 +import android.annotation.NonNull;
  import android.annotation.Nullable;
 +import android.annotation.TestApi;
  import android.annotation.UserIdInt;
  import android.app.ActivityManager;
  import android.attention.AttentionManagerInternal;