[automerger skipped] Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d049 am: aee55feaa6 -s ours am: 308797afcf -s ours
am skip reason: Merged-In Icf8906c972cf18d65a22d30c3a628fd54db59179 with SHA-1 866cf34016 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907
Change-Id: Ie12ae63c87c090fd2293642c1438143f4c0c035d
This commit is contained in: