Merge "Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea am: 7f8d8638eb am: ca312c1cd3 am: 9eb3d7e335"