Merge "DO NOT MERGE Point directly to generated c sysprop_library" into...

Merge "DO NOT MERGE Point directly to generated c sysprop_library" into stage-aosp-master am: 281c6ffb am: 25b41157 am: 20f4d8fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19569673



Change-Id: Id094427065a423935a2d88d8bd7b74206606f98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>