[automerger skipped] Merge "Ensure that ScanInfo is cached before callbacks fire" into sc-v2-dev am: 328b8f6c87 -s ours am: 390ae48e28 -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: I7accb19b26310b83a5db918b9369d8dbd1f7cf15
This commit is contained in: