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

Change-Id: I746939ec543ef1d13bbb8dbbdb1422554736d91d