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

Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c