Merge "Add return value annotation to getSoundTriggerMode" into sc-dev

core/java/android/os/BatterySaverPolicyConfig.java

@@ -247,6 +247,7 @@ public final class BatterySaverPolicyConfig implements Parcelable {
     /**
      * Get the SoundTrigger mode while in Battery Saver.
      */
+    @PowerManager.SoundTriggerPowerSaveMode
     public int getSoundTriggerMode() {
         return mSoundTriggerMode;
     }