Merge "Add setScannable to AdvertisingSetParameters (1/2)" am: 7f14b8f095
am: 8d06b41826

Change-Id: I8cc220bd494841841f89eeba840ce71b1c2a0692