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

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



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