Merge "[automerger skipped] Merge "DO NOT MERGE: [PATCH] Fix Toggle Bluetooth test dialogs" into nougat-mr1-cts-dev am: 9afccaa8 -s ours" into oreo-cts-dev am: 578db49f -s ours Change-Id: I5aa8b7dfd42149a648b8984d03b38179ec3f55ef