Rebase to master@7027916

Tests run:
Forrest run pass for mts/thethering/device-all:
https://android-build.googleplex.com/builds/tests/view?invocationId=I89100006858350663&testResultId=TR93615946156976621

Forrest run failed for suite/test-mapping-mainline-presubmit-retry_cloud-tf. Error ignored because they are existing errors
before we merge the changes.
https://android-build.googleplex.com/builds/forrest/run/L68000000768091009

Coverage run passed:
https://android-build.googleplex.com/builds/forrest/run/L34200000771124544
show in dashboard: https://cnsviewer.corp.google.com/ear/cns/yb-d/home/android-code-coverage/prod/reports/git_mainline-daily-release/P18543032/

Change-Id: If25018ec6012ca280213ac4f62cbda33adffaa55
Exempt-From-Owner-Approval: rebase
BUG: 175508046