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