Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b
am: aab38e2b34
am: c8c9a75eb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074 Change-Id: If9e71caa500499b154f47bb19d035eb8da2db7c2
This commit is contained in: