Merge "Add API to support async network scans."

diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
index e7cd6d8,c8bc862..10e9035
--- 1/telephony/java/com/android/internal/telephony/ITelephony.aidl
--- 2/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@@ -29,9 -31,9 +31,10 @@@ import android.telephony.ClientRequestS
  import android.telephony.IccOpenLogicalChannelResponse;
  import android.telephony.ModemActivityInfo;
  import android.telephony.NeighboringCellInfo;
+ import android.telephony.NetworkScanRequest;
  import android.telephony.RadioAccessFamily;
  import android.telephony.ServiceState;
 +import android.telephony.SignalStrength;
  import android.telephony.TelephonyHistogram;
  import android.telephony.VisualVoicemailSmsFilterSettings;
  import com.android.ims.internal.IImsServiceController;