[automerger skipped] Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d0 am: aee55fea -s ours am: 308797af -s ours am: a767196a -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: Ic54b3615f9569f390354c24588cdc172d25ff537