[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" am: da2b966f6e am: b64a3ad7
am: 981b51f1 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 e8099b90 is in history
Change-Id: I970d26d216013298d01b429097e9ee2fd63ea69d