Merge "Fix NPE when starting advertising with null GATT" am: 4d98474f2a
am: cff1ab6210

Change-Id: I70d52a26c838ae672763704b0ebd58f29a77dcca