Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising.""

This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java
index 601d9ee..c9df9c0 100644
--- a/core/java/android/bluetooth/BluetoothGatt.java
+++ b/core/java/android/bluetooth/BluetoothGatt.java
@@ -581,7 +581,15 @@
             public void onAdvertiseStateChange(int state, int status) {
                 if (DBG) Log.d(TAG, "onAdvertiseStateChange() - state = "
                         + state + " status=" + status);
-	    }
+            }
+
+            /**
+             * @hide
+             */
+            @Override
+            public void onMultiAdvertiseCallback(int status) {
+                // no op.
+            }
 
             /**
              * Callback invoked when the MTU for a given connection changes