[automerger skipped] Merge "Ensure that ScanInfo is cached before callbacks fire" into sc-v2-dev am: 328b8f6c87 -s ours
am skip reason: Merged-In I4670da109256170121ceb6d8fbad0efda310335f with SHA-1 1fe18a79d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16124861
Change-Id: Id2c62e133bbe6ef88893d8a2d39cbc451305725f
This commit is contained in: