[automerger skipped] Merge "Update bluetooth preference to take user to new...
[automerger skipped] Merge "Update bluetooth preference to take user to new screen" into pi-dev am: ce53cbee
am: fbc5abb8 -s ours
Change-Id: Ia4d639f332780d767e17edc512b57027421ea275