Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4
am: aa826d85b1
Change-Id: I125357eef5dc23cb6b1d74e02649aa18bdf89b31
This commit is contained in: