[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
am:f98ada2290-s ours am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA164307cc0b2is in history Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05
This commit is contained in: