Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433 am: e9e158f469

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195

Change-Id: Idbf038ee0d4e060d55cd2140b69ac3e49196a05e