Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev