[automerger skipped] Merge "Replaced Bluetooth SystemProperties.set by...

[automerger skipped] Merge "Replaced Bluetooth SystemProperties.set by sysprop" am: 2d65acb4 am: fe38541f am: 1efab191 am: 1417738e -s ours

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

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

Change-Id: I69f46eea4a7a20c2b670215da8aacf347afcb21a