Merge "Add nullability annotations to android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid" am: ce5fdc042a
am: dd2b92d97d

Change-Id: I692321496709d9172b96805257bfef46be34a6ea