Merge "Add var to enable/disable tethering next APEX" am: e9370c5ef4 am: bbd7155ec0 am: cbe02105ec am: c78389cd58

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962623

Change-Id: Ibcfcf3a338b2ece38f93fe0cfa9475587cfb5876