[automerger skipped] Merge "DO NOT MERGE Point directly to generated c...

[automerger skipped] Merge "DO NOT MERGE Point directly to generated c sysprop_library" into stage-aosp-master am: 281c6ffb am: 25b41157 am: 20f4d8fd am: eecd56d1 -s ours

am skip reason: subject contains skip directive

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



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