Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074

Change-Id: I5f15b643e74e226ebdb5a5c742564b20ae7b7901