Merge changes I4af73809,Iba6a564a,I3305b71e
am: 5640e1d836

Change-Id: Ia0bfa4b3135a12f2e38438f192baa6ebb641bc4b
diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java
index a7f45a0..af582a2 100644
--- a/core/java/android/telephony/TelephonyRegistryManager.java
+++ b/core/java/android/telephony/TelephonyRegistryManager.java
@@ -25,6 +25,8 @@
 import android.net.NetworkCapabilities;
 import android.os.Binder;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerExecutor;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.telephony.Annotation.ApnType;