[automerger skipped] Merge "Get rid of ResultStorageDescriptor" am: 344c8a53 am: 11c94bed -s ours

am skip reason: Merged-In Id8155f666f28cbecab414e6c074a1a7ea74cd947 with SHA-1 39fad6a1 is already in history

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

Change-Id: I58dcbe40a59e3160e33b6e6e8fe05c9da60a2cba