[automerger skipped] Merge "Revert "Do not put apex updatable in qpr"" am: 5a1e7df2 -s ours

am skip reason: Merged-In Ib4beaa784d3eb79e18d0d8e9cc64a22b1f5d965e with SHA-1 20a684b3 is already in history. Merged-In was found from reverted change.

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

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



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