[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" am: da2b966f am: 97c67880
am: 2407bf4a -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 5f8f3034 is in history
Change-Id: I970d26d216013298d01b429097e9ee2fd63ea69d