[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d0 am: aee55fea -s ours

am skip reason: Merged-In Icf8906c972cf18d65a22d30c3a628fd54db59179 with SHA-1 866cf340 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907

Change-Id: I590a615a2ff9cd54f9bfbf5f21628bb8c464b1aa