[automerger skipped] Merge "Add com.android.bluetooth.updatable to resolver...

[automerger skipped] Merge "Add com.android.bluetooth.updatable to resolver apex_available" am: 29af8895 am: a7602378 -s ours am: 3bdeb041 -s ours am: 9f7c6dba -s ours am: 95ffbc75 -s ours

am skip reason: Change-Id I949433b3d4f073b064e61b7106ba1cf852441c7b with SHA-1 70519256 is in history

Change-Id: I168bc80bfd5648e60de382254ed4c22e10cca6da