Merge "Revert "Do not put apex updatable in qpr"" am: 87d40daf

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



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