[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-BT-result-storage-descriptor-remove-t1jhhedypv" into sc-dev-plus-aosp am: f4c0d709 am: 00193cb2 -s ours

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

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

Change-Id: I21ba45568cc9e272b8049c025317cd57c387b509