am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

* commit '41f5437def4b97581d67b5636ca2dba10f8eb385':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."