am df736de8: am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time."

* commit 'df736de8d8165b1aff675d00581ccdf94a7547aa':
  [ActivityManager] Fix index out of bounds when updating next pss time.