Merge "Add var to enable/disable tethering next APEX" am: e9370c5ef4 am: 23565ae472

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

Change-Id: Ie73306a261fd2f6ad6fc32ddf6e8c1f27393a060