[automerger skipped] Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 4d612ad87b am: a9e669070b am: c748403369 am: 3fac6d3746 -s ours

am skip reason: Merged-In I613808dbc930c90e391df9857a173a86aedc4acf with SHA-1 f636a3147f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914690

Change-Id: I69f46eea4a7a20c2b670215da8aacf347afcb21a