am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started servi...

* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.

diff --cc services/core/java/com/android/server/am/ActiveServices.java
index be2df04,d66c5a7..a845127
mode 100644,100755..100755
--- 1/services/core/java/com/android/server/am/ActiveServices.java
--- 2/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java