Merge "DO NOT MERGE: Disable tethering.inprocess APEX in stable branch" into sc-mainline-prod