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

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

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



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