Merge changes from topic "networklocationFeatureId"

* changes:
  Pipe through featureId for network location checks
  Support feature context in TelephonyManager

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index d5d0dcea9438..00c536913097 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -16,6 +16,7 @@
 
 package android.content;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
@@ -928,6 +929,11 @@ public class ContextWrapper extends Context {
     }
 
     @Override
+    public @NonNull Context createFeatureContext(@Nullable String featureId) {
+        return mBase.createFeatureContext(featureId);
+    }
+
+    @Override
     public boolean isRestricted() {
         return mBase.isRestricted();
     }