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

Change-Id: I4cf745b758b696c4da3ebb1cb5843d929b634fae