tree 7221ec2ef06fc13b320b4a1a65904a0942bd3528
parent 1aa4a78374770712b0bc73667a980b318db9f808
parent 32b1a4129ec7b6936a22194854c290021213e19a
author hughchen <hughchen@google.com> 1526548640 -0700
committer android-build-merger <android-build-merger@google.com> 1526548640 -0700

[automerger skipped] Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev am: 273faa216e
am: 32b1a4129e  -s ours

Change-Id: If29cfc933d69a6db92ab7317323ff338bb0366ec