[automerger skipped] Get rid of ResultStorageDescriptor in startScan am: 5aa40b903a am: 9cf37f5fe7 -s ours am: d1acb1da9f -s ours
am skip reason: Merged-In Ia2d65def69b13150a20e8a2077c3fe630f8ec86e with SHA-1 374836844e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765906
Change-Id: Iec3df92582c2375f189829b59f49e92ce429a902
This commit is contained in: