Merge "ActivityManagerService: explicitly break connection cycles" into pi-dev