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

Change-Id: I5cb2100aa2a91daa3b21de7758a44067d75751cd