Merge "Fix adaptive_sleep resetting after reboot" into rvc-dev am: f9551ba4e1 am: ca31f89c74 am: 76658dac62

Change-Id: I7c9e35cd4ab13d48a507b66a26710d8a7e936cba

services/core/java/com/android/server/attention/AttentionManagerService.java

@@ -165,7 +165,7 @@ public class AttentionManagerService extends SystemService {
      * Returns {@code true} if attention service is supported on this device.
      */
     private boolean isAttentionServiceSupported() {
-        return isServiceEnabled() && isServiceAvailable();
+        return isServiceEnabled() && isServiceConfigured(mContext);
     }
 
     @VisibleForTesting
@@ -210,6 +210,11 @@ public class AttentionManagerService extends SystemService {
             return false;
         }
 
+        if (!isServiceAvailable()) {
+            Slog.w(LOG_TAG, "Service is not available at this moment.");
+            return false;
+        }
+
         // don't allow attention check in screen off state
         if (!mPowerManager.isInteractive()) {
             return false;