tree 5d285d7ee284f063786293f50fcdf74bf535c9de
parent 5996679b4b37bbdc37268d1f33eea53609769926
parent 1c600eed4938bde3b6f2cf83b741c59dc79e0f69
author Sarah Chin <sarahchin@google.com> 1612504199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612504199 +0000

Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3dc22a55c1de4b51927499d1d33b1aa66b8a752