Merge "[automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 am: a0e45fb2c9 am: a0e99180f5 -s ours" into rvc-qpr-dev-plus-aosp