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

Change-Id: I04f8786655f21b0dcf516f3dccb847424e45ce65