DO NOT MERGE: rebase
 Rebase to master@7013937

Test: Used forrest runs to test, the coverage run issues (in comment#47) didn't show up:
1. mts/networking/gce-coverage-r-build-module-on-r-platform against git_mainline-daily-release  android-build.googleplex.com/builds/forrest/run/L09700000761037977
Coverage data is shown in https://cnsviewer.corp.google.com/ear/cns/yb-d/home/android-code-coverage/prod/reports/git_mainline-daily-release/P18237420/mainline_module_x86_coverage/
2. mts/tethering/device-all against mainline-prod: android-build.googleplex.com/builds/forrest/run/L64300000761332494
3. suite/test-mapping-mainline-presubmit-retry_cloud-tf: android-build.googleplex.com/builds/forrest/run/L84800000761332695


Change-Id: I16455a9fc4c83328221faaf12ac544094c5421f7
Merged-In: I716ceacd3af80e26113e1520d33147f7844e4820

Exempt-From-Owner-Approval: rebase
BUG: 173451928
Change-Id: I16455a9fc4c83328221faaf12ac544094c5421f7