Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61

Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642