Merge "Non-executable things should not be marked executable" am: 6df0b6ec am: 1ec904c3

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



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