Merge changes from topic "presubmit-am-e038dde5f29f46ce9a87a4b1aa3f0c1e"

* changes:
  [automerged blank] DO NOT MERGE: Disable tethering.inprocess APEX in stable branch 2p: d981a68aa0
  DO NOT MERGE: Disable tethering.inprocess APEX in stable branch