[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
am: f98ada22 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0 is in history
Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05