[automerger skipped] Merge "DO NOT MERGE: [PATCH] Fix Toggle Bluetooth test dialogs" into nougat-mr1-cts-dev
am: 9afccaa8a8  -s ours

Change-Id: Ic1a41f1b63a565b2607407964d5dbf2d88c82a5a