[automerger skipped] Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev am: c1770fe4cf
am: c635251a94
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451 Change-Id: I97324fe9877d635665e908c74f7983535317dd06
This commit is contained in: