[automerger skipped] Get rid of ResultStorageDescriptor in startScan am: 5aa40b90 am: 9cf37f5f -s ours

am skip reason: Merged-In Ia2d65def69b13150a20e8a2077c3fe630f8ec86e with SHA-1 37483684 is already in history

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

Change-Id: I7862aa492a50379dd9ac220370979eec0c850bb0